首页 探索 帮助
注册 登录
J1X
/
huginn
关注 2
点赞 0
派生 0

浏览代码
Update docker documentation and compose examples

Dominik Sander 9 年之前
父节点
5c38c0bec7
当前提交
079be0b447
共有 4 个文件被更改，包括 90 次插入 和 60 次删除
显示文件统计
  1. 2 2
      docker/multi-process/README.md
  2. 35 25
      docker/multi-process/docker-compose.yml
  3. 2 2
      docker/single-process/README.md
  4. 51 31
      docker/single-process/develop.yml

+ 2 - 2
docker/multi-process/README.md
查看文件 

@@ -96,9 +96,9 @@ For variables in the .env.example that are commented out, the default is to not
96 96
97 97 
 ## Building on your own
98 98
99 
-You don't need to do this on your own, because there is an [automated build](https://registry.hub.docker.com/u/cantino/huginn/) for this repository, but if you really want:
99 
+You don't need to do this on your own, because there is an [automated build](https://registry.hub.docker.com/u/cantino/huginn/) for this repository, but if you really want run this command in the Huginn root directory:
100 100
101 
-    docker build --rm=true --tag={yourname}/huginn .
101 
+    docker build --rm=true --tag={yourname}/huginn -f docker/multi-process/Dockerfile .
102 102
103 103 
 ## Source
104 104

+ 35 - 25
docker/multi-process/docker-compose.yml
查看文件 

@@ -1,28 +1,38 @@
1 
-mysqldata:
2 
-  image: mysql:5.7
3 
-  command: /bin/true
1 
+# This needs at least compose 1.6.0
2 
+version: '2'
4 3
5 
-mysql:
6 
-  image: mysql:5.7
7 
-  volumes_from:
8 
-    - mysqldata
9 
-  environment:
10 
-    MYSQL_ROOT_PASSWORD: myrootpassword
11 
-    MYSQL_DATABASE: huginn
12 
-    MYSQL_USER: huginn
13 
-    MYSQL_PASSWORD: myhuginnpassword
4 
+services:
5 
+  mysqldata:
6 
+    image: mysql:5.7
7 
+    command: /bin/true
14 8
15 
-huginn:
16 
-  build: .
17 
-  ports:
18 
-    - 3000:3000
19 
-  environment:
20 
-    HUGINN_DATABASE_NAME: huginn
21 
-    HUGINN_DATABASE_USERNAME: root
22 
-    HUGINN_DATABASE_PASSWORD: myrootpassword
23 
-    INTENTIONALLY_SLEEP: 10
24 
-    #DATABASE_INITIAL_CONNECT_MAX_RETRIES: 5
25 
-    PORT: 3000
26 
-  links:
27 
-    - mysql
9 
+  mysql:
10 
+    image: mysql:5.7
11 
+    volumes_from:
12 
+      - mysqldata
13 
+    ports:
14 
+      - "3306:3306"
15 
+    environment:
16 
+      MYSQL_ROOT_PASSWORD: myrootpassword
17 
+      MYSQL_DATABASE: huginn
18 
+      MYSQL_USER: huginn
19 
+      MYSQL_PASSWORD: myhuginnpassword
28 20
21 
+  huginn:
22 
+    build:
23 
+      context: ../../
24 
+      dockerfile: docker/multi-process/Dockerfile
25 
+    restart: always
26 
+    environment:
27 
+      HUGINN_DATABASE_NAME: huginn
28 
+      HUGINN_DATABASE_USERNAME: root
29 
+      HUGINN_DATABASE_PASSWORD: myrootpassword
30 
+      INTENTIONALLY_SLEEP: 10
31 
+      #DATABASE_INITIAL_CONNECT_MAX_RETRIES: 5
32 
+      PORT: 3000
33 
+      MYSQL_PORT_3306_TCP_ADDR: mysql
34 
+      MYSQL_PORT_3306_TCP_PORT: 3306
35 
+    ports:
36 
+      - 3000:3000
37 
+    links:
38 
+      - mysql

+ 2 - 2
docker/single-process/README.md
查看文件 

@@ -81,9 +81,9 @@ For variables in the .env.example that are commented out, the default is to not
81 81
82 82 
 ## Building on your own
83 83
84 
-You don't need to do this on your own, but if you really want:
84 
+You don't need to do this on your own, but if you really want run this command in the Huginn root directory:
85 85
86 
-    docker build --rm=true --tag={yourname}/huginn .
86 
+    docker build --rm=true --tag={yourname}/huginn -f docker/single-process/Dockerfile .
87 87
88 88 
 ## Source
89 89

+ 51 - 31
docker/single-process/develop.yml
查看文件 

@@ -1,35 +1,55 @@
1 
-mysqldata:
2 
-  image: mysql:5.7
3 
-  command: /bin/true
1 
+# This needs at least compose 1.6.0
2 
+version: '2'
4 3
5 
-mysql:
6 
-  image: mysql:5.7
7 
-  volumes_from:
8 
-    - mysqldata
9 
-  environment:
10 
-    MYSQL_ROOT_PASSWORD: myrootpassword
11 
-    MYSQL_DATABASE: huginn
12 
-    MYSQL_USER: huginn
13 
-    MYSQL_PASSWORD: myhuginnpassword
4 
+services:
5 
+  mysqldata:
6 
+    image: mysql:5.7
7 
+    command: /bin/true
14 8
15 
-huginn_web:
16 
-  build: .
17 
-  restart: always
18 
-  extends:
19 
-    file: environment.yml
20 
-    service: huginn_base
21 
-  ports:
22 
-    - 3000:3000
23 
-  links:
24 
-    - mysql
9 
+  mysql:
10 
+    image: mysql:5.7
11 
+    volumes_from:
12 
+      - mysqldata
13 
+    ports:
14 
+      - "3306:3306"
15 
+    environment:
16 
+      MYSQL_ROOT_PASSWORD: myrootpassword
17 
+      MYSQL_DATABASE: huginn
18 
+      MYSQL_USER: huginn
19 
+      MYSQL_PASSWORD: myhuginnpassword
25 20
26 
-huginn_threaded:
27 
-  build: .
28 
-  restart: always
29 
-  extends:
30 
-    file: environment.yml
31 
-    service: huginn_base
32 
-  links:
33 
-    - mysql
34 
-  command: /scripts/init bin/threaded.rb
21 
+  huginn_web:
22 
+    build:
23 
+      context: ../../
24 
+      dockerfile: docker/single-process/Dockerfile
25 
+    restart: always
26 
+    environment:
27 
+      DATABASE_ADAPTER: mysql2
28 
+      DATABASE_NAME: huginn
29 
+      DATABASE_USERNAME: huginn
30 
+      DATABASE_PASSWORD: myhuginnpassword
31 
+      APP_SECRET_TOKEN: 3bd139f9186b31a85336bb89cd1a1337078921134b2f48e022fd09c234d764d3e19b018b2ab789c6e0e04a1ac9e3365116368049660234c2038dc9990513d49c
32 
+      MYSQL_PORT_3306_TCP_ADDR: mysql
33 
+      MYSQL_PORT_3306_TCP_PORT: 3306
34 
+    ports:
35 
+      - 3000:3000
36 
+    links:
37 
+      - mysql
38 
+
39 
+  huginn_threaded:
40 
+    build:
41 
+      context: ../../
42 
+      dockerfile: docker/single-process/Dockerfile
43 
+    restart: always
44 
+    environment:
45 
+      DATABASE_ADAPTER: mysql2
46 
+      DATABASE_NAME: huginn
47 
+      DATABASE_USERNAME: huginn
48 
+      DATABASE_PASSWORD: myhuginnpassword
49 
+      APP_SECRET_TOKEN: 3bd139f9186b31a85336bb89cd1a1337078921134b2f48e022fd09c234d764d3e19b018b2ab789c6e0e04a1ac9e3365116368049660234c2038dc9990513d49c
50 
+      MYSQL_PORT_3306_TCP_ADDR: mysql
51 
+      MYSQL_PORT_3306_TCP_PORT: 3306
52 
+    links:
53 
+      - mysql
54 
+    command: /scripts/init bin/threaded.rb
35 55